From: Aleksander Jan Bajkowski Date: Mon, 22 Sep 2025 18:46:04 +0000 (+0200) Subject: kernel: move accepted patch to backport directory X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=13a22b0030df29846604f844a0e9dfa909740cc5;p=openwrt%2Fopenwrt.git kernel: move accepted patch to backport directory This patch has already been accepted and landed in 6.17. Signed-off-by: Aleksander Jan Bajkowski Link: https://github.com/openwrt/openwrt/pull/20132 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/generic/backport-6.12/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch b/target/linux/generic/backport-6.12/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch new file mode 100644 index 0000000000..dedb5b1a9f --- /dev/null +++ b/target/linux/generic/backport-6.12/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch @@ -0,0 +1,28 @@ +From ddbf0e78a8b20ec18d314d31336a0230fdc9b394 Mon Sep 17 00:00:00 2001 +From: Aleksander Jan Bajkowski +Date: Sun, 31 Aug 2025 12:59:07 +0200 +Subject: net: sfp: add quirk for FLYPRO copper SFP+ module + +Add quirk for a copper SFP that identifies itself as "FLYPRO" +"SFP-10GT-CS-30M". It uses RollBall protocol to talk to the PHY. + +Signed-off-by: Aleksander Jan Bajkowski +Reviewed-by: Russell King (Oracle) +Link: https://patch.msgid.link/20250831105910.3174-1-olek2@wp.pl +Signed-off-by: Jakub Kicinski +--- + drivers/net/phy/sfp.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -474,6 +474,9 @@ static const struct sfp_quirk sfp_quirks + SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex, + sfp_fixup_nokia), + ++ // FLYPRO SFP-10GT-CS-30M uses Rollball protocol to talk to the PHY. ++ SFP_QUIRK_F("FLYPRO", "SFP-10GT-CS-30M", sfp_fixup_rollball), ++ + // Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball + // protocol to talk to the PHY and needs 4 sec wait before probing the + // PHY. diff --git a/target/linux/generic/backport-6.6/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch b/target/linux/generic/backport-6.6/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch new file mode 100644 index 0000000000..a155d4aa97 --- /dev/null +++ b/target/linux/generic/backport-6.6/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch @@ -0,0 +1,28 @@ +From ddbf0e78a8b20ec18d314d31336a0230fdc9b394 Mon Sep 17 00:00:00 2001 +From: Aleksander Jan Bajkowski +Date: Sun, 31 Aug 2025 12:59:07 +0200 +Subject: net: sfp: add quirk for FLYPRO copper SFP+ module + +Add quirk for a copper SFP that identifies itself as "FLYPRO" +"SFP-10GT-CS-30M". It uses RollBall protocol to talk to the PHY. + +Signed-off-by: Aleksander Jan Bajkowski +Reviewed-by: Russell King (Oracle) +Link: https://patch.msgid.link/20250831105910.3174-1-olek2@wp.pl +Signed-off-by: Jakub Kicinski +--- + drivers/net/phy/sfp.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/net/phy/sfp.c ++++ b/drivers/net/phy/sfp.c +@@ -459,6 +459,9 @@ static const struct sfp_quirk sfp_quirks + SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex, + sfp_fixup_long_startup), + ++ // FLYPRO SFP-10GT-CS-30M uses Rollball protocol to talk to the PHY. ++ SFP_QUIRK_F("FLYPRO", "SFP-10GT-CS-30M", sfp_fixup_rollball), ++ + // Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball + // protocol to talk to the PHY and needs 4 sec wait before probing the + // PHY. diff --git a/target/linux/generic/pending-6.12/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch b/target/linux/generic/pending-6.12/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch deleted file mode 100644 index dedb5b1a9f..0000000000 --- a/target/linux/generic/pending-6.12/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ddbf0e78a8b20ec18d314d31336a0230fdc9b394 Mon Sep 17 00:00:00 2001 -From: Aleksander Jan Bajkowski -Date: Sun, 31 Aug 2025 12:59:07 +0200 -Subject: net: sfp: add quirk for FLYPRO copper SFP+ module - -Add quirk for a copper SFP that identifies itself as "FLYPRO" -"SFP-10GT-CS-30M". It uses RollBall protocol to talk to the PHY. - -Signed-off-by: Aleksander Jan Bajkowski -Reviewed-by: Russell King (Oracle) -Link: https://patch.msgid.link/20250831105910.3174-1-olek2@wp.pl -Signed-off-by: Jakub Kicinski ---- - drivers/net/phy/sfp.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/net/phy/sfp.c -+++ b/drivers/net/phy/sfp.c -@@ -474,6 +474,9 @@ static const struct sfp_quirk sfp_quirks - SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex, - sfp_fixup_nokia), - -+ // FLYPRO SFP-10GT-CS-30M uses Rollball protocol to talk to the PHY. -+ SFP_QUIRK_F("FLYPRO", "SFP-10GT-CS-30M", sfp_fixup_rollball), -+ - // Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball - // protocol to talk to the PHY and needs 4 sec wait before probing the - // PHY. diff --git a/target/linux/generic/pending-6.6/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch b/target/linux/generic/pending-6.6/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch deleted file mode 100644 index a155d4aa97..0000000000 --- a/target/linux/generic/pending-6.6/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ddbf0e78a8b20ec18d314d31336a0230fdc9b394 Mon Sep 17 00:00:00 2001 -From: Aleksander Jan Bajkowski -Date: Sun, 31 Aug 2025 12:59:07 +0200 -Subject: net: sfp: add quirk for FLYPRO copper SFP+ module - -Add quirk for a copper SFP that identifies itself as "FLYPRO" -"SFP-10GT-CS-30M". It uses RollBall protocol to talk to the PHY. - -Signed-off-by: Aleksander Jan Bajkowski -Reviewed-by: Russell King (Oracle) -Link: https://patch.msgid.link/20250831105910.3174-1-olek2@wp.pl -Signed-off-by: Jakub Kicinski ---- - drivers/net/phy/sfp.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/net/phy/sfp.c -+++ b/drivers/net/phy/sfp.c -@@ -459,6 +459,9 @@ static const struct sfp_quirk sfp_quirks - SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex, - sfp_fixup_long_startup), - -+ // FLYPRO SFP-10GT-CS-30M uses Rollball protocol to talk to the PHY. -+ SFP_QUIRK_F("FLYPRO", "SFP-10GT-CS-30M", sfp_fixup_rollball), -+ - // Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball - // protocol to talk to the PHY and needs 4 sec wait before probing the - // PHY.